summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockCactus.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Blocks/BlockCactus.h')
-rw-r--r--src/Blocks/BlockCactus.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h
index 29e86d085..371402423 100644
--- a/src/Blocks/BlockCactus.h
+++ b/src/Blocks/BlockCactus.h
@@ -36,7 +36,7 @@ public:
return false;
}
- // Check surroundings. Cacti may ONLY be surrounded by air
+ // Check surroundings. Cacti may ONLY be surrounded by non-solid blocks
static const struct
{
int x, z;
@@ -53,7 +53,11 @@ public:
NIBBLETYPE BlockMeta;
if (
a_Chunk.UnboundedRelGetBlock(a_RelX + Coords[i].x, a_RelY, a_RelZ + Coords[i].z, BlockType, BlockMeta) &&
- cBlockInfo::IsSolid(BlockType)
+ (
+ cBlockInfo::IsSolid(BlockType) ||
+ (BlockType == E_BLOCK_LAVA) ||
+ (BlockType == E_BLOCK_STATIONARY_LAVA)
+ )
)
{
return false;